From ac2cb8a8afdab2b1bad8bce4e51e3536a9ed00d7 Mon Sep 17 00:00:00 2001 From: "smh22@tempest.cl.cam.ac.uk" Date: Thu, 30 Dec 2004 14:59:09 +0000 Subject: [PATCH] bitkeeper revision 1.1159.1.517 (41d417bddbJQbGTNZdimylJpzcXpqQ) build fixes --- linux-2.4.28-xen-sparse/arch/xen/kernel/setup.c | 4 ++-- linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/linux-2.4.28-xen-sparse/arch/xen/kernel/setup.c b/linux-2.4.28-xen-sparse/arch/xen/kernel/setup.c index 3b27174ba6..f08f3a4369 100644 --- a/linux-2.4.28-xen-sparse/arch/xen/kernel/setup.c +++ b/linux-2.4.28-xen-sparse/arch/xen/kernel/setup.c @@ -62,8 +62,8 @@ shared_info_t *HYPERVISOR_shared_info = (shared_info_t *)empty_zero_page; unsigned long *phys_to_machine_mapping, *pfn_to_mfn_frame_list; -multicall_entry_t multicall_list[8]; -int nr_multicall_ents = 0; +DEFINE_PER_CPU(multicall_entry_t, multicall_list[8]); +DEFINE_PER_CPU(int, nr_multicall_ents); /* * Machine setup.. diff --git a/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c index e3f345ac9b..d10c749a1b 100644 --- a/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c +++ b/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c @@ -62,6 +62,7 @@ static void vbd_update(void){}; #define BLKIF_STATE_DISCONNECTED 1 #define BLKIF_STATE_CONNECTED 2 +#ifdef VERBOSE static char *blkif_state_name[] = { [BLKIF_STATE_CLOSED] = "closed", [BLKIF_STATE_DISCONNECTED] = "disconnected", @@ -74,6 +75,7 @@ static char * blkif_status_name[] = { [BLKIF_INTERFACE_STATUS_CONNECTED] = "connected", [BLKIF_INTERFACE_STATUS_CHANGED] = "changed", }; +#endif #define WPRINTK(fmt, args...) printk(KERN_WARNING "xen_blk: " fmt, ##args) -- 2.30.2